Merge from emacs-24; up to r110778
authorGlenn Morris <rgm@gnu.org>
Sat, 3 Nov 2012 19:14:22 +0000 (12:14 -0700)
committerGlenn Morris <rgm@gnu.org>
Sat, 3 Nov 2012 19:14:22 +0000 (12:14 -0700)
commit9c3a3c07f83e845297043d00cfd7443414d5bf55
tree35eac3e7e45bd9399a7994d570ad5bf5883fe984
parent8203e13c0e26319e4f88f6659b377cab9963da7a
parenta6f9c40d23ebbcd72a273cef06f9414743222c95
Merge from emacs-24; up to r110778
ChangeLog
doc/misc/ChangeLog
etc/NEWS
lisp/ChangeLog
msdos/sed2v2.inp
src/ChangeLog
src/xdisp.c